Add 0015-Look-for-crt1.o-in-the-correct-multiarch-location.patch.

Thanks to Sven Joachim <svenjoac@gmx.de> for the report and the patch,
and and Philipp Kern <pkern@debian.org> for the 23.3+1-1.1 NMU, which
included it.

Closes: #629567

diff --cc debian/.git-dpm
index 2869ad7758238c55fcf8250d1c71287a395ddf6f,0000000000000000000000000000000000000000..c8171fa2e2a601be981e9b08e9a871c0370ac92a
mode 100644,000000..100644
--- 1/debian/.git-dpm
--- /dev/null
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
- 5a055b561f5403a1a8e30d2d614cf51293aec5a2
- 5a055b561f5403a1a8e30d2d614cf51293aec5a2
 +# see git-dpm(1) from git-dpm package
++a81a47f989199e0705fdd7b2142dee04f497f721
++a81a47f989199e0705fdd7b2142dee04f497f721
 +7aee3de6fd6bca44751754b10a338947fa947b1c
 +7aee3de6fd6bca44751754b10a338947fa947b1c
 +emacs23_23.3+1.orig.tar.bz2
 +80b3822579eddfc120641c5a181eb0b5c7a0667d
 +23065394

diff --cc debian/patches/0015-Look-for-crt1.o-in-the-correct-multiarch-location.patch
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..7a94ba7f8e1699b285834763c458d187e14459df
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/debian/patches/0015-Look-for-crt1.o-in-the-correct-multiarch-location.patch
@@@ -1,0 -1,0 +1,42 @@@
++From a81a47f989199e0705fdd7b2142dee04f497f721 Mon Sep 17 00:00:00 2001
++From: Rob Browning <rlb@defaultvalue.org>
++Date: Mon, 24 Oct 2011 22:29:59 -0500
++Subject: Look for crt1.o in the correct multiarch location.
++
++The Emacs build should now be able to handle the fact that crt1.o is
++no longer in /usr/lib.  It was moved to support multarch.
++
++Provided-by: Sven Joachim <svenjoac@gmx.de>
++Date: Sat, 25 Jun 2011 08:25:48 +0200
++Applied-by: Rob Browning <rlb@defaultvalue.org>
++Bug-Debian: http://bugs.debian.org/629567
++Applied-Upstream: http://lists.gnu.org/archive/html/emacs-diffs/2010-04/msg00325.html
++---
++ src/s/gnu-linux.h |    4 ++--
++ 1 files changed, 2 insertions(+), 2 deletions(-)
++
++diff --git a/src/s/gnu-linux.h b/src/s/gnu-linux.h
++index c13cb60..953341d 100644
++--- a/src/s/gnu-linux.h
+++++ b/src/s/gnu-linux.h
++@@ -168,7 +168,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
++ /* Ask GCC where to find libgcc.a.  */
++ #define LIB_GCC `$(CC) $(C_SWITCH_X_SITE) -print-libgcc-file-name`
++ 
++-#define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o
+++#define START_FILES pre-crt0.o $(CRT_DIR)/crt1.o $(CRT_DIR)/crti.o
++ 
++ /* Here is how to find X Windows.  LD_SWITCH_X_SITE_AUX gives an -R option
++    says where to find X windows at run time.  */
++@@ -198,7 +198,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
++ #define LIBS_DEBUG
++ #undef LIB_GCC
++ #define LIB_GCC
++-#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtn.o
+++#define LIB_STANDARD -lgcc -lc -lgcc $(CRT_DIR)/crtn.o
++ 
++ /* Don't use -g in test compiles in configure.
++    This is so we will use the same shared libs for that linking
++-- 
++1.7.6.3
++

diff --cc debian/patches/series
index 36dac0d534c905643af2373de5cb1b58bb328c16,0000000000000000000000000000000000000000..b089e65379256faa7174907a43cee766e4a502e8
mode 100644,000000..100644
--- 1/debian/patches/series
--- /dev/null
+++ b/debian/patches/series
@@@ -1,14 -1,0 +1,15 @@@
 +0001-Prefer-usr-share-info-emacs-23-over-usr-share-info.patch
 +0002-Run-debian-startup-and-set-debian-emacs-flavor.patch
 +0003-Remove-files-that-appear-to-be-incompatible-with-the.patch
 +0004-Adjust-documentation-references-for-Debian.patch
 +0005-Cause-the-build-to-fail-if-liblockfile-isn-t-selecte.patch
 +0006-Avoid-silently-losing-mail-via-fakemail.patch
 +0007-Modify-the-output-of-version-to-indicate-Debian-modi.patch
 +0008-Look-for-NEWS-in-order-to-find-etc-rather-than-GNU.patch
 +0009-Invoke-the-correct-xmlstarlet-executable-on-Debian-s.patch
 +0010-Fix-startup-hang-on-Debian-GNU-kFreeBSD.patch
 +0011-Don-t-clear-FONTCONFIG_LIBS-and-FONTCONFIG_CFLAGS-in.patch
 +0012-Fix-a-tty-related-preprocessor-inclusion-error-affec.patch
 +0013-Expect-0-from-kill-for-zombies-on-GNU-Hurd.patch
 +0014-Add-i386-to-cpp_undefs-in-configure.in-to-fix-i386-m.patch
++0015-Look-for-crt1.o-in-the-correct-multiarch-location.patch